Fix service discovery path issues. Add tests. Update readme.