Ticket #59: Update to JUnit 4