Removed tests from the old databinding conflict code which no longer exists and added new tests for the new conflict interaction