fix conductor service with tests