Kill and tests

If anybody has objections... feel free to comment... I'll just merged this :)