Last changes to make the tests pass