Prep more of the tests for before/after