Functional tests for Tables + bug fix