Updated for JUnit 4