fixes for tests, fix for yet another urlencoding issue