Fix some racy tests