Improved compatibility with the BMHV scheme in Anti5.
Reworked unit tests for Anti5.