back to working version of all 4 tests