updated tests after rebase