Fixed tests to handle new interface