Add test command.
Add help text.
Clean up a bit.