Try to fix the test problems after the async changes #3061
KristjanESPERANTO:develop% was force-pushed and no longer has any new commits.
Pushing new commits will allow the pull request to be re-opened.
Pushing new commits will allow the pull request to be re-opened.