Bug fix for expression parsing in simple conditionals
Added fix to ignore empty params for templates
Updated test case to catch earlier bug in simple conditional parsing