Om Prakaash

Hey, can I work on this issue ?

I could just implement the additional checks for this test with current existing methods in this PR. Can the new abstractions be part of a separate PR later on ?

Thank you for the review ! Will make the required changes.

Sorry for the delay, finally got a chance to work on this again.