Really fixed tombstoned test this time ;)