Lots of changes for a static test. Added fields to diagnostic message.