Fixing tests to use new baseUrl/path