Fix tests, fix a bug in multiline strings, and additional minor cleanup