added variable substitution also for properties
new unit test