improving tests to fix the build
Merge pull request #240 from geosolutions-it/upstream-master

improving tests to fix the build
Merge branch 'master' of git://github.com/geotools/geotools