fix tests
finish up some of the tombstone code