Handle and test expressions
Refactor and simplify tests for more clarity