Re-linked imports for unit tests. Moved the Table class to its own file.