More test fix attemtps