Updated description handling and tests