Fix ConditionalTest test system
Merge pull request #3814 from cpennington/ok-conditional-test

Fix ConditionalTest test system