Fix scenario tests

WindowsAzure#1317
WindowsAzure#1407