[TEST] jUnits

refactoring and fixes