One more test, two more bugs.