JUnit task v1.2 (add some tests and fixes)