Fix issues introduced by rebase
Fix broken unit test after rebase