JUnit tests improvements.