Fixes and full table 8 test