Fix failing tests (except consumer tests)