Fixed the unit tests and incresed the retries to 3