Switched to using a single test service and type.