Adjust tests to new behavior