Merge 2 tests. Remove checkstyle errors.