Merge "Add data driven RecordSet tests"