minor refine
separate test case