Minor adjustments for defaults and test data.