Excised some unused code. Added additional best two-byte tests.