fixbug: in all in one test
 merge