[GEOT-4574]: Updating tests
Merge branch 'master' of git://github.com/geotools/geotools