For ENG-3982, fix test case and modify to cover another type of restore bug
For ENG-3982, fix yet more bugs in the test, and add validation that ensures the test actually tests what we think it is testing.
Merge pull request #323 from VoltDB/ENG-3982-test

Eng 3982 test