Remove test loop in test
Fix major templating bug