=act,tes Small TestKit cleanup
=act Make death watch tests test something
Merge pull request #2042 from jozic/small-testkit-cleanup

=act,tes Small TestKit cleanup
Merge pull request #2041 from jozic/deathwatch-tests

=act Make death watch tests test something
Merge remote-tracking branch: upstream/master