Fixed failing tests for _test_pickme_conflict_master