Fix test project after rebase