JUnit 4 added, fixed testing