Improve documentation
Fix tests build (two tests are failing, though)
Fix TestShape