Changed classpath to use JUnit (I think)