Added table tests. Minor corrections