Refactor and update CRDT test