Missing test from TestFlushSnapshotFromClient in 0.94

There's a missing test from TestFlushSnapshotFromClient (0.94) and a missing delete snapshot at the end of another test that cases jdk7 to fail, since the tests are executed in a different order.