[TIMOB-18117] Main Tests Cleanup

Cherry Pick PR #42 into stable

Fixes [TIMOB-18117](https://jira.appcelerator.org/browse/TIMOB-18117)