checkstyle rules, import order, etc
more checkstyle
fix broken tests