Fixed tests to work with new interface