renamed the tests to match the functions they're testing;
moved this utility function closer to where it's going to be used;
don't need this any more;
added CLI tools as a dependency and imported into the namespace;
more test coverage;