Some changes in the tests side