enhance hw tests