Testing table and image
Add some small checks
Refactor