Template tests moved to new test file