JUnit Tests improved