More test fixation