Fix checkstyle bugs in tests