Less use of eval( in unit tests
Less use of eval( in unit tests

mcandre/factor,erg/factor,mcandre/factor,erg/factor,erg/factor,erg/factor,mcandre/factor,mcandre/factor,mcandre/factor,mcandre/factor,erg/factor,mcandre/factor,erg/factor,erg/factor