Updated to use JUnit 4.11