Fix for over zealous IDE refactor.
Checkstyle and test fixes.