Remove a few things we don't need.
Simplify a test by changing the exception message instead.