Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationServiceImpl.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationServiceImpl.java	(revision f58ea6a805660cc091df62859461f24d535f8853)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationServiceImpl.java	(revision 21980dae5b4aaf7573324f2f42966268827198e8)
@@ -604,5 +604,5 @@
 		List<String[]> ddlEvaluationData = new ArrayList<String[]>();
 		List<String> resultsHeadersSimple = new ArrayList<String>();
-		List<String> resultsErrors = new ArrayList<String>();
+		List<String> resultsDbConnErrors = new ArrayList<String>();
 
 		String[] queryToRun = {
@@ -774,4 +774,5 @@
 					Connection connection = null;
 					String DbPass = "", DbName = "", DbUser = "";
+					String DbNameCensored = "*****";
 					String gradingSchema = AppConfig.getString(ApplicationConstants.STUDENTDBS_JDBC_SCHEMA);
 					String mainUrl = AppConfig.getString(ApplicationConstants.STUDENTDBS_JDBC_URL);
@@ -794,4 +795,5 @@
 							} else {
 								logger.error("Did not find student data for {}", likestring);
+								resultsDbConnErrors.add(DbNameCensored + " - Did not find student data");
 							}
 
@@ -831,11 +833,11 @@
 							if (w != null) {
 								logger.debug("warning");
-								resultsErrors.add(w.getMessage());
+								resultsDbConnErrors.add(DbNameCensored + " - " + w.getMessage());
 							}
 							connection.rollback();
 						} catch (Exception e) {
 							if (statusCounter == 0) {
-								logger.error("{}", e);
-								resultsErrors.add(e.getMessage());
+								logger.error("{}", e.getMessage());
+								resultsDbConnErrors.add(DbNameCensored + " - " + e.getMessage());
 							} else {
 								logger.error(
@@ -843,5 +845,5 @@
 										DbName, queryToRun[n], e.getMessage());
 								logger.debug("Exception: {}", e);
-								resultsErrors.add(e.getMessage());
+								resultsDbConnErrors.add(DbNameCensored + " - " + e.getMessage());
 							}
 						} finally {
@@ -868,6 +870,7 @@
 			}
 		}
+
 		return new Triplet<List<String[]>, List<String>, List<String>>(ddlEvaluationData, resultsHeadersSimple,
-				resultsErrors);
+				resultsDbConnErrors);
 	}
 
Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java	(revision f58ea6a805660cc091df62859461f24d535f8853)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java	(revision 21980dae5b4aaf7573324f2f42966268827198e8)
@@ -451,5 +451,5 @@
 		return getTestInstancesForStudentByTestType(student.getStudentId(),
 				tti.getTestInstance().getTestTemplate().getTestType().getTestTypeId()).stream()
-						.anyMatch(ti -> ti.getTestInstanceId() == tti.getTestInstance().getTestInstanceId());
+				.anyMatch(ti -> ti.getTestInstanceId() == tti.getTestInstance().getTestInstanceId());
 	}