Merge "Use JUnit4 for tests"