Fix tests with the new defaults