Untidy test fix for multi-threading.