Add retry to accomodate slow VM environments

Hi Vedu,

Can you please use TEST_RETRY_FACTOR and TEST_DELAY_FACTOR environment variables to multiple these. Then we can tune into what ever values that we need.

Thanks