We still have some old Junit 3 style tests hanging around. We should convert them to the Junit 4 approach using @Test annotation.

Moreover AcceptanceTestSuite needs to be converted to the annotation driven approach.