Minor fixes related to the use of the library ALL and OR.
Added one more test (nested || and &&).