Hard fork intg test more coverage develop

[ghost-not-in-the-shell]

Explain your changes: solve merge conflict of #15567

Explain how you tested your changes: *

Checklist:

• [ ] Dependency versions are unchanged

  • Notify Velocity team if dependencies must change in CI

• [ ] Modified the current draft of release notes with details on what is completed or incomplete within this project

• [ ] Document code purpose, how to use it

  • Mention expected invariants, implicit constraints

• [ ] Tests were added for the new behavior

  • Document test purpose, significance of failures
  • Test names should reflect their purpose

• [ ] All tests pass (CI will check this if you didn't)

• [ ] Serialized types are in stable-versioned modules

• [ ] Does this close issues? List them

• Closes #0000

[ghost-not-in-the-shell]

!ci-build-me