Encode ' ' as '%20' after all.

Revert earlier commit; encode space as %20 in headers, and modify tests
accordingly.