Fix test_helper dependency, clean up test.
Adding test for kill.
Consistent cases.
Revert helper require, add test for #remove.
Merge pull request #947 from sshingler/cli-test

Adding test for CLI#kill