fix some things bugs from the separation transition, and try to fix the test scripts