Condition strategy fixes + tests.