Improved description generation and added SpecsTests