math_functions fix from Sylvain
UPdated in Helper from Sylvain
Unit test updates from Sylvain