Finish incomplete work on state management logic, testing, and test fixtures
Description
This issue represents the follow-up work related to state management logic, testing, and test fixtures.
See the following MRs for a partial, incomplete implementation of this work:
Edited by Chad Woolley