Make death watch tests test something and split test