Revert to beforeAll methods

This doesn’t fix the problem, only lets previous users work. Still
working on a fix.