Fix ICE
Fix resolution tests