More tests, fixes for bugs found in tests, escaping
Merge pull request #3 from KoryNunn/master

More tests, fixes for bugs found in tests, escaping