[TIMOB-16684] Fixed unit tests to pass.
Merge pull request #120 from appcelerator/timob-16684_3_2_X

[TIMOB-16684] Fixed unit tests to pass.