Refactor unzipper test