Fix (un)archiver and add a test