More tests and converting package to CRDT