Changed parser to not process full expressions at rule-value level
Fixed unit tests