more services and pruned default tests