Fixed the junit tests and have a test to make sure junit tests run
Merge pull request #1451 from benmccann/2.1.x-tests-fix

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