Moved all tests to JUnit and cleaned up dependencies