correcting test name
Merge branch 'next' into sam_2134_iii