Fix tests after rebase on master