[ssubstitutions] Fixes substitutions in the compiler pass
[test] Fixes test for the compiler pass
Merge pull request #20 from kimu/fixes-substitutions

[substitutions] Fixes substitutions in the compiler pass