Fixed the junit tests and have a test to make sure junit tests run

This fixes it so that the test are run on the 2.1.x branch. (I originally tested this patch against and old version of the 2.1.x branch which was only on junit-interface 0.9 and that did not work, so do make sure to test against the latest code)