Scan scenarios now takes ITestContext

Was quite good, the existing tests broke in many places when I missed something