Merge "Convert tests to JUnit 4 style"