added unit services and tests