Tests for math and gauss combination functions, multi-estimate function improved.

New math and gauss combination functions have been tested to some degree.
Moved some tests from combinefunction to general_util test suite.
Multi-estimate was two functions, now one to stop code duplication.
Removed some commented code that is now obsolete.