Merge branch 'rs/simplify-archive-tests'