Resolve conflict in unti tests