Do expression
Updated tests