Handle unary expressions, and add missing files
Add tests