Fixed .NET 4.0/4.5 issue with System.Threading.Tasks

Working on basic tests