Fixed QueryString formatting and added tests for Template Utils