prepare services for ServiceLoader
add combined function and tests