Improved test for kill call.
Merge branch 'master' of github.com:n3phele/openstack-factory