Adjust tests to new defaults.