Add tests for services