Fixed tests after rebase