Merge "Add _sync_state tests"