Merge "Fix broken archive tests."