Refactored Suite, added Template Bindings test.