Remove useless option
Implement verbose option
Use with statement for files in tests
Add help for some command options