Refactored common parent calculation + tests for archive generation