Added hitest support