Prepare base test class for CLI tests

Change-Id: Iae4a9c88d0e398d295900d58ae014798267fde1e
Merge "Prepare base test class for CLI tests"