Fix for #96

Implemented retry logic for test timeouts.