More test safety