Fix 71M tests
Merge branch 'aden-831-fix-71M-tests'