Reimplement service wrapper
Add tests for service decoration
Bump