Fixing tests broken by error handling changes.
Merge pull request #257 from apigee/20131121-testfixes

I'm going to ack this myself since it is just righteous text fixes.