Finally, 'make test' is working for burp-1 again.
Clean up in the restore code.