Fixed error with string literals, and added some more tests