Fixed incorrect changes in server reset tests

Change-Id: Ifc5a7519d1628067cfac8b77f737479be2138215
Merge "Fixed incorrect changes in server reset tests"