fixed tests and JUnit/Maven test running