Cleanup sahara cli tests

* better readability
* local variable names fixed

Change-Id: Ie584db672c502ab9e58062a997f539027990403a
Merge "Cleanup sahara cli tests"