Clean up redundancies in Table and related tests