Finished the tests for conflict generation/resolution