run generate-tester, and some fixes