more test refactoring; add kill test