Implement expressions
Refactor tests