CHANGED zero timeouts and delay when running in development or test environments
Clean error handling
Our test cases need delay longer than 0 seconds