More tests with a hint of refactoring

Are you referring to the class name? That is unusual for java.

https://google-styleguide.googlecode.com/svn/trunk/javaguide.html#s5.2.2-class-names