Naru - Fixed issue with blocking TPL and Unit Tests.