fixed headpin cli test failures

Based on the latest test reports
http://hudson.rhq.lab.eng.bos.redhat.com:8080/hudson/job/official-headpin-cli/199/ReportNG_Report/

Fixed all the test failures.
Please, review it.
Thanks