Added Square and Tabletop classes + tests
Update to work in progress