Testing Fixes - smarter diffing without object ids, and test report generation timing fix