A lot of changes in the tests