add equality test
refactor test simple expressions