Refactoring and some JUnit tests