Fixed the tests in line with the new changes