Merge "Tests for Condition." into nyc-dev