More test fix ...