Attempt to fix intermittently failing tests