Move the cleanup to beforeEach/afterEach