Refactor archive tests