additional unit tests
added tombstone endpoint option