Merge pull request #278 from apple/revert-274-fix-expanded-warnings-tests

Revert "test suite fixes to prep for enabling additional warnings"