Remove --use-mirrors
Bugfix, improve Service UT