Zurich - days till close metric corrected

As per Matthew "as with confirmed/in progress this should be 6 - it's
five days from moderation so is most simply just done as being six since
creation"
Zurich: move mech test into override_config stanza

This was causing previous test failures when config != Zurich, due
to expected logic not getting triggered.