resolved 6 tests