* Cleanup and Changes based on reviewer comments * For failure, show returned and expected values CORE-17005