Increase code coverage, fix checkstyle warnings