Fix failing tests caused be exception renames.

A bunch of tests started failing because of exception class renames.