Fix test cases
Change header-table data structure to list
Cleanup