Updating tests to use template registration