Fix tests after 04080cc7fe04b46edf069ac17f657c2dabcd0ed1