Attempt to fix racy tests