Don't attempt to tearDown tests that couldn't have been run.
Merge branch 'master' into dsuch-f-gh201-sec-api-keys