Fix save wait time add more test code.