adding back non-service tests