Added comments and table tests