Cherry pick: Added corrected test for modified fields of interest