TODO:changes to architecture internals for fast test

[charchit7]

What does this PR do?

Fixes #5262

Claiming this issue with this PR.
Next Step : Working on this issue. Thanks!

Before submitting

• [] This PR fixes a typo or improves the docs (you can dismiss the other checks if that's the case).
• [x ] Did you read the contributor guideline?
• Did you read our philosophy doc (important for complex PRs)?
• Was this discussed/approved via a Github issue or the forum? Please add a link to it if that's the case.
• Did you make sure to update the documentation with your changes? Here are the
  documentation guidelines, and
  here are tips on formatting docstrings.
• Did you write any new necessary tests?

[charchit7]

fixed in #5370