Fixed unit tests after rebase/merge