Fix unit test for JDK1.5 build