New CLI output.
New testing files.