Merge "Move cli tests into service subdirectories"