Fixing and adding test for expressions with parenthesis and fields with spaces in where expressions inside parenthesis