Merge "Fix archive tests." into arc-apps