fixed minor conflict in unit test