Fixed tests to be more resilient to slow startup