Minor test data tweaks