Continued working on replacement of hardcoded backends in GIS tests

Hopefully you'll find the added comments helpful!