fixed failing tests for headpin-cli nightly

Please review it