Fix Based on feedback SigHst Test part 2  issue no 2,3,10