Fix TissueSample bioMeasurement averaging
fixing test cases
Merge branch 'origin/3.x'