Remove a couple of funny meta characters that snuck in somehow
Add a few more tests