More updates to diagnostic field tests.
Updating tests following schema changes.