More test tweaking.