Refactoring verbose flag: tests and code