More test fixes and rebase conflicts!