Fix compilation and tests after the roll-up