(#11) Tweak tests again.