Fix source dir
Add tests of service info factory