Convert tests to JUnit 4
Fix up tests
Yikes