Fixed loads of checkstyle warnings
Reverted some changes to fix broken test