Change verbose format, fix tests