Changes to JUnit Framework and Tests