Eng 3982 test

Fixes an important snapshot restore test and adds some additional checks to make sure the test actually validates the condition it is setting out to validate.