Corrected sample
Cleaned up some stuff
Made verbose default, added quiet option and usage help
Updated test, moved to /tests folder
Updated CLI usage help