Fixing client-side tests to support new URL scheme