[TIMOB-18117] Main Tests Cleanup

Fixes [TIMOB-18117](https://jira.appcelerator.org/browse/TIMOB-18117)