Merge pull request #259 from gavincornwell/master

Enhanced workflow service tests
Merge pull request #260 from gavincornwell/master

Fixed failing test on Cloud