Fix bug and long run test passed