And "And" and "Or" constraint syntax.
Don't report failed tests as working.
Cleanups.
Add test for bug #20359 (not fixed yet).