Updated tests to the new interface