Fix tests for testswarm
Fix cherry-pick issue. The master branch tests should not be run in oldIE.