Use more specific assertions about expected exceptions. Also use stricter arrange-act-assert patterns in some places.
