Fix hunit tests