Federico and zaida

And change the tests