Re #7279. Fixed unit test that originally worked on my machine.
Merge branch 'feature/7279_SetSampleMaterial_improvements' into develop