Added option to use quotation marks for strings in maps
Fixed template test for new test
Fixed generic type parameters being recognized as two values
by enclosing them with quotation marks