Tweaks and tests.