Really fixed extra space after escaped spaces.

Updated tests.