More test tweaking