See my main comment about the changes to HttpRequestTest. In fact, this test name isn't even valid any more because plus no _no longer_ becomes a "UrlEncodedSpace".