More services and tests