Update more tests to match test-data XML changes