Adjust tests to changes