Hacky rename + other test tweaks, make test nodev
Device make test works without manual intervention
Only one fatal restart, then notify with failure

Additionally, slight refactor of restarting code