Test: Revert global before/afterEach and setup/teardown

Ref #650