Also fix compilation of tests in Java 6