Conversion of 3.x JUnit tests to 4.x.

Currently the project has a mixture of 3.x and 4.x JUnit tests. It would be preferable to move all tests to the 4.x style.

I have completed this work, thanks in part to a (slightly broken) http://junit-converter.sourceforge.net/.