Fixed the tests with new changes