Refactor tests, test switching in class as well.
Checkstyle.