fixes for checkstyle findings in test class