Add new commands to CLI; add unit tests.