improved JUnit-Tests