Incorporate resolve conflicts unit tests

This rebases !2740 (merged) against master to incorporate changes from !2693 (merged). It addresses the unit tests that require refactoring.