Add shared count and additional test
Resolve merge conflict