added some more enhancments and logs due to flakiness
added test retries for some flaky tests