Added beforeEach and afterEach