[RFR] Fix tests