changed JUnitTests to JUnit4, and fixed a "stray import".