fixing tests after rebase