Fix bug in UnifyingResolutions
Fix UnifyingResolution test case
Fix UnifyingResolution bug

And now the test case works too.