Fix tests

SimpleTest isn't actually a test, and causes lots of problems if we
try to treat it as one. Having JUnit also helps.