More tests fixes
Fixed another failing test
Removed unneeded GEOSERVER flag