Reworking test tables to include foreign keys - still WIP