Added some basic tests and table code