Merge branch 'modTests' into dev

fixed conflict

diff --cc appveyor.yml
index 99fa834b4aeb0a02296211e64a7c0dd0119c327d,91f117952a9107ff53b947122030f85e2e73d9e2..0f9142b4715ae7aa8d832842c7c71e2c214c6b16
--- 1/appveyor.yml
--- 2/appveyor.yml
+++ b/appveyor.yml
@@@ -9,13 -9,13 +9,13 @@@
      - COMPILER: "gcc"
        HOST:     "mingw"
        PLATFORM: "x64"
-       SCRIPT:   "make allarch MOREFLAGS=-static && make -C tests test-symbols fullbench-dll fullbench-lib"
 -      SCRIPT:   "make allzstd && make -C tests test-symbols fullbench-dll fullbench-lib"
++      SCRIPT:   "make allzstd MOREFLAGS=-static && make -C tests test-symbols fullbench-dll fullbench-lib"
        ARTIFACT: "true"
        BUILD:    "true"
      - COMPILER: "gcc"
        HOST:     "mingw"
        PLATFORM: "x86"
-       SCRIPT:   "make allarch MOREFLAGS=-static"
 -      SCRIPT:   "make allzstd"
++      SCRIPT:   "make allzstd MOREFLAGS=-static"
        ARTIFACT: "true"
        BUILD:    "true"
      - COMPILER: "clang"