Initial fixes to table joins
Merge branch 'feature/tests' into feature/joined-tables
Added database data to test vs joined tables
Completed work on joined tables
Added tests for joined tables
Merge remote-tracking branch 'origin/feature/joined-tables' into development