Increase timeout to 40 seconds. Now all tests pass here.