fix most test