some refactoring + organizing junit