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

[TIMOB-18117] Main Tests Cleanup