Some changes at the tests