Expanded class hierarchy of tablesUnitTest