small refactoring of unpacking tests