Fix test errors
More test fixes