tests: fix several kill problems