cleaned up the beforeEach calls to move to before where applicable