Merge "[pm/incremental] unit tests for state transitions"