patched tests to work with new locations (minus authority)