Improved consolidated resolution testing. #1454
Merge pull request #1473 from sbt/wip/resolve-consolidation2

Improved consolidated resolution testing. #1454