Annotate a few more methods
Use specific exceptions
Mend some bugs exposed by specific exceptions
Use the context manager form of assertRaises