Fixing checkstyle violations, adding new test