Checkstyle cleanup, start adding some generic unit tests.