Added initial value-map for expressions
Added where own tests