Make the tests pass, fix the expectations and the whole arranging step