Fix tests that needed updating after the changes to address format.