modified all tests