Switch to using before/afterFeature and before/afterSuite