Add more tests for arrow conflicts. Fix edge case.