Improved expression evaluation

Expressions as in DataShardTeset example should work :)