Some progress in getting Services module tests working with Core Persistence.