The unpacking test is too coarse grained. It's basically a legacy issue, but they need to be improved so that the unpacking can be extended in a robust manner. Propose:

• Break down the tests by hardware, so that we can understand which hardware is not being unpacked correctly.
• Add unit tests, one per function (or so) that really executes the code for a variety of inputs. May require hacking together some fake unpacking...