[Resolver] Further regressions/Began with updating unittests