Fixed Strings being parsed for template functionality.
Updated tests.