Yet another cleanup before a new test