Some more test tweaking.