Tweak and fix tests.