Improved testing of generation of the rich object