Fixed tests and added new tests for the new conflicted fields work