Fixing nock restore
Fix UT
Revert incorrect change
Merge pull request #1274 from andrerod/dev

Fixing nock restore