Update tests to match test-data XML changes