Fixed Tests Broken By SingleSpaceElement Logic
Changed Order Of Operations To Avoid Bugs.