ENYO-2935: fix substitutions

- add non-reg test suite for this too.

Enyo-DCO-1.1-Signed-off-by: Francois-Xavier KOWALSKI <francois-xavier.kowalski@hp.com>