added tests for nil input and all orderings of conflict/non_conflict