Logging, removing deadlock, test