Rolling out ahead of tests on related columns/tables

TODO: Build out tests for related tables.