fixing ExpireTestOnRestartTest
Merge pull request #880 from clebertsuconic/Branch_2_2_EAP

fixing ExpireTestOnRestartTest