Adding Minor code change (that with the fix to TM code) made all test run locally (now lets see on TeamCity :)  )