Remaining change to OR.
Added a test with nested && and ||. Works now.