Merge table and table header
Fix tests
Update dependencies