[ALOY-784] fix for some tests
Merge pull request #369 from skypanther/ALOY-784b

[ALOY-784] fix for some tests
[ALOY-784] fix for some tests
Merge branch 'master' of https://github.com/appcelerator/alloy