fix most test number change bugs