Merge "Improve JUnit test coverage"