Restored MAFundOptimizer to version that passes unit tests
trying to get both the unit tests to pass and the controller not to throw an exception