Fix failing unit tests due to bad rebase