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