Reworking test-restart to make more sense.