Update description
Fix tests