Fix failing tests (junit version on classpath is now 4.12)