modified 2 tests