More test refactoring, and made build start failing for checkstyle violations