Add tests for new service