[Prd-4216] Corrections from review.  Also added a gold test report.