Fix callback url handling and tests.