Merge "Revert "Adding logs to debug test failures"" into main