GEOS-5813: fixed unit tests