Updated test data to work with new column names