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

[TIMOB-16684] Fixed unit tests to pass.