Rich descriptions, plus fix a test which a merge made fail