Added tests for tombstone handling

Added integration tests that exercise the new tombstone
handling.