Added clause to account for a test suite completely failing out of the gate.
Merge branch 'develop'