Added a few unit tests (remove text for HI)