Refactor and add Merge Proposal testing