fixing test after rebase