Tweaks to tests.