reorganized @Before method in attempt to speed up