Converted to JUnit4
Simplified test code