Fix scenario test failures

WindowsAzure#1160