Add UnifyingResolution test case
Fix bug in UnifyingResolutions