More test fixing attempts