Fixing checkstyle + re-enabling a test
2 files changed