Re-order count increment to make unit tests deterministic