did some fixes at Kill test so it can run