Add test for #9.

Also move test for #2 to have a more regular structure for tests aimed at
specific bugs.
Post-release version bump