Implementation for one level deeps resolve. Fix tests.