Remove patch
Refactor tests

Test where inadvertently overwriting the request. This is exposed a problem in the setup, where a opening / was required in the whitelisted url prefixes