More progress on getting test to pass with Core Persistence, also allow forked C* and ES for Core and Services modules.