test fixes after rebase