Merge main and test projects