Fix cli/command/service/opts_test.go, and add some extra test cases Upstream-commit: 715d301f12 Component: cli
715d301f12