More changes for before/after tests.