Start moving towards JUnit 4 tests