Fix the cucumber virus checker so that it mimics the VirusScanHelper

This is needed as we will mark the files a not clean otherwise.
And Images on people have many variations which also need moving