Updated templates to match new base tests