fixed failing tests after rebase