Further refinement/simplification of ContactManagerImpl, and new batch of tests in ContactManagerTest