fixed JUnit tests