Fixing the Capture Scenario break due to last commit and cleaning up the fetchTest functions