Fixing spaces, and adding assertions to user tests