Updated unit-tests
Moved pruning of relationships to resolve
Build