Change template tests to reflect the arguments now passed to them