Table-related macs accept dicts
Remove my own table data
Update tests for get_tabular_data
Reformat code for consistency