merged unzipper-tests