Replaced Junit 3 tests with Junit 4 tests