GEOS-5619 JDK7 fixes

Hi,
I've fixed some tests so they can run on JDK7.