Update CLI test_medium tests

Update field lookup for operating systems.

Also improve formatting.
Merge pull request #1614 from elyezer/update-cli-test-medium

Update CLI test_medium tests