[TIMOB-18117] Main Tests Cleanup
Merge pull request #43 from vishalduggal/timob-18117-stable

[TIMOB-18117] Main Tests Cleanup