Unit Test Classes: ConflictResolverTest