fix tests that broke after rebase