resolved 7 tests