small refactoring
jUnit tests
tests