improve body process logic and test case