Add test files for new merger tool and spawn/git