Fixes failing tests caused by mirror_of change