Fix failing tests from 6d1b5c4dafd60cc02eccf1d947e8c57e6afed8b9