Multiples before Each
Restored all tests
Removed legacy helper