More fixes to disable AVX in tests