Handle null values
Add table information function
more unit tests