Test Fixes:

1. All broken Tabular tests now working