Unit test fixes. Task related model definition tests are not run against Cloud as task types are not exposed on Cloud.
Merge pull request #331 from gavincornwell/master

Unit test fixes.