Added CLI guards around test scripts

Change-Id: I0850bfd38a2ea4e32592ec3833b861ee5c9723cf
Merge "Added CLI guards around test scripts"