Fix restart state loop

Using the special state maker for itself which causes loops on timeout on timeout. 
This test looks the same as the previous test, anything I'm missing?