Tests

Merge this and push to heroku asap - it should fix the bugs...
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.