OAK-1717 refactoring of test. WIP.
OAK-1717 refactoring cleaning-up.
OAK-1717 adding the conflict handler to test for investigation