opts: minor cleanup in tests, and remove some import aliases#6186

thaJeztah merged 2 commits into

docker:masterdocker/cli:masterfrom

thaJeztah:remove_more_aliasesthaJeztah/cli:remove_more_aliasesCopy head branch name to clipboard