Testing overlapping changes