Fix specs and reorganize methods in preparation for IdentityMap strategy pair