fix api and geoserver tests