A bunch of fixes for state machines

[kddejong]

Issue #, if available:
fix #3527
fix #3526
fix #3525
fix #3524

Description of changes:

• A bunch of fixes for state machines

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.42%. Comparing base (1b6146b) to head (b5814b5).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3528      +/-   ##
==========================================
- Coverage   93.43%   93.42%   -0.01%     
==========================================
  Files         337      337              
  Lines       11202    11202              
  Branches     2329     2329              
==========================================
- Hits        10467    10466       -1     
  Misses        411      411              
- Partials      324      325       +1     

Flag	Coverage Δ
unittests	?

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.