Make expected failures more precise, by restricting the set of allowed exceptions
Fix test failures (typos exposed by the previous commit)
Merge pull request #534 from pitrou/better_expected_failures

Better expected failures (#534)