Revised tests to allow for true conditions.