code clean chhanges
Add XH class unit tes
Merge commit '558299c710c6b543f68bc38bca28a59b350b9789'