Added more tests and fixed a bug in ht.c