refactor resolution tests

Change-Id: I05e779668cdc1ac6ae83d935b1684f5164ac6b6c