Fixing all the tests to work with the new interface