More testing on kills.
Merge branch 'test' into dev