Fix failing tests (except for one)