Adding missing expected conditions. Fixes issue 4698