AN/HB: Changed method and made tests run faster
Bump to 2.1.1