fix tests and move service to the right location.

/cc @kdeggelman