Are we going to remove these "temp" layers after modernizing all the unit tests? What's the plan here?