Revert "change assign statement to expression"

This reverts commit d44469c15e3cd894ad7ff8866752a136f648479e.
revert assign and update testcases