Review forked Smart Table

Test cases added as per your code review comments