More test fixing