Make expected exception descriptions more uniform
Write all "Thens" as "should"