Fix tests after 6d9c91013fdb41e4743631b1170955282a176286