Merging changes from another test project