[TIMOB-18117] Main Tests Cleanup