Continued working on replacement of hardcoded backends in GIS tests