More tests.
One more test, and one more bugfix.