Cleanup of expr
Add expr tests