More test fixes after API change.