NAS-2276 All tests now pass, and all traces of JUnit3 functionality has been removed.