Converted to JUnit tests