Finish incomplete work on state management logic, testing, and test fixtures

Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.

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 🤖 GitLab Bot 🤖