Update test to use a template