BZ and BNZ added and tests for both.