Review main Merged

40511[TASK] Removes eval() in Unit Tests

Wouter Wolters CR +2 V +2 Hard +240 −142 updated 06/22/15, 09:46