Fix up some tests broken in move to JUnit 4