Fixes tests to work with the new interface