Fix comment and skipping test number.
Fix expiration_time and wait seconds for test stability.