restructuring of JUnit tests