sim reset flow fixup
test fixup
refactor fixup