Fix failing tests
Fix failing tests

samdeane/GRMustache,samdeane/GRMustache,ipmobiletech/GRMustache,ThesaurusSoftware/GRMustache,samdeane/GRMustache,lumoslabs/GRMustache,saim80/GRMustache,ThesaurusSoftware/GRMustache,ipmobiletech/GRMustache,sdonly/GRMustache,sdonly/GRMustache,lumoslabs/GRMustache,ipmobiletech/GRMustache,sdonly/GRMustache,lumoslabs/GRMustache,groue/GRMustache,groue/GRMustache,groue/GRMustache,mz2/GRMustache,ThesaurusSoftware/GRMustache,saim80/GRMustache,saim80/GRMustache,mz2/GRMustache,mz2/GRMustache