Fix tests for new defaults