(JUnit Tests) Additional method refactoring.