Fixed HB tests