Task #0084: Mean square displacment and block averages tests, fixes and cleanup.