Added more tests
Fixed analyzer issues on Table