Address Checkstyle violations in tests