Test cases changed to JUnit 4 style