Fix missed merge conflict text, rename engine and tester