Add tests and more logging for Service