Add matcher for conditions. All tests pass for now.