udpate unittest and retry