2 files changed, 13 insertions, 9 deletions

diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java
index 3f2698bb..775e825c 100644
--- a/test/core/src/lombok/RunTestsViaEcj.java
+++ b/test/core/src/lombok/RunTestsViaEcj.java
@@ -137,7 +137,7 @@ public class RunTestsViaEcj extends AbstractRunTests {
 				i.remove();
 			}
 		}
-		classpath.add("bin");
+		if (new File("bin").exists()) classpath.add("bin");
 		classpath.add("dist/lombok.jar");
 		classpath.add("lib/test/commons-logging-commons-logging.jar");
 		classpath.add("lib/test/org.slf4j-slf4j-api.jar");
diff --git a/test/core/src/lombok/core/TestSingulars.java b/test/core/src/lombok/core/TestSingulars.java
index 1134af08..4560615d 100644
--- a/test/core/src/lombok/core/TestSingulars.java
+++ b/test/core/src/lombok/core/TestSingulars.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 The Project Lombok Authors.
+ * Copyright (C) 2015-2017 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,31 +22,35 @@
 package lombok.core;
 
 import static lombok.core.handlers.Singulars.autoSingularize;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import org.junit.Test;
 
 public class TestSingulars {
 	@Test
 	public void testSingulars() {
-		assertEquals(null, autoSingularize("axes"));
+		assertNull("axes", autoSingularize("axes"));
 		assertEquals("adjective", autoSingularize("adjectives"));
 		assertEquals("bus", autoSingularize("buses"));
 		assertEquals("octopus", autoSingularize("octopodes"));
-		assertEquals(null, autoSingularize("octopi"));
+		assertNull("octopi", autoSingularize("octopi"));
 		assertEquals("elf", autoSingularize("elves"));
 		assertEquals("jack", autoSingularize("jacks"));
 		assertEquals("colloquy", autoSingularize("colloquies"));
-		assertEquals(null, autoSingularize("series"));
+		assertNull("series", autoSingularize("series"));
 		assertEquals("man", autoSingularize("men"));
-		assertEquals(null, autoSingularize("highwaymen"));
+		assertNull("highwaymen", autoSingularize("highwaymen"));
 		assertEquals("caveMan", autoSingularize("caveMen"));
-		assertEquals(null, autoSingularize("jackss"));
-		assertEquals(null, autoSingularize("virus"));
+		assertNull("jackss", autoSingularize("jackss"));
+		assertNull("virus", autoSingularize("virus"));
 		assertEquals("quiz", autoSingularize("quizzes"));
 		assertEquals("database", autoSingularize("databases"));
 		assertEquals("dataBase", autoSingularize("dataBases"));
 		assertEquals("Query", autoSingularize("Queries"));
 		assertEquals("Movie", autoSingularize("Movies"));
+		assertEquals("cafe", autoSingularize("cafes"));
+		assertNull("caves", autoSingularize("caves"));
+		assertEquals("leaf", autoSingularize("leaves"));
+		assertEquals("autosave", autoSingularize("autosaves"));
 	}
 }