Improve JUnit test coverage