test: Add back state recovery test and refactor #1603

Job	Run time
Assign PR to creator	5s
Add issues to project and add triage label	0s
	5s

Provide feedback