cleanup
added _sub support and tests to service_type