Fix tests and implement more description generation.