Cleanup Statistics Unittests and CMath