Adjust tests to API change