Move more state updating into the post process test.

This fixes phase-sync when master sync is not active