Added more stuff for hatest