* Restore WMS layers in layers.json for testing

* Factor out duplicated code