Clean tests output
Add CLI