Fix conflict in unit tests