Improve get name from expression
Update unit tests