More tests & share-manager work.