Potential fixes for Intermittent deployment scanner test failures