Refactoring javagal.test classes