Adjust tests to new signatures