VMS-690 GRIND-56 - updated fix for ghost test.

This is a follow-up and fix for changeset:
8d5400c0dbae00f3c14d1e1af1c95e1219b49527
review: http://reviews.gridcentric.ca/#/c/3081/

Fixed cleanup on success.  Fixed and improved ghost destroy checks.

Change-Id: Ied092e6ea0a5baae8f98619af66e2c0aee13bfc2