Modify existing tests to use new template

Change-Id: I4225bf856c70c5563cbe62051081b2e3de7d64cc