fixed actual bug that caused regressions
merged master
Merge pull request #75 from occamlabs/it-test-fixes

GFI templating fix