Better handling of string literals, new integration tests