fixes CLI test (maybe
made table_maker and test
deleted annoying merge conflict files