Remove duplicated tests, test template override