add external includes tests
adjust ModelFindService API