More test fixes after fixture changes.