WIP: core/services/services-internal tests passing