Add WMS servers
Revert fix for #330 and fix tests