Simplify verbose level, combine "skip" level into verbose (remove "trim" flag)
Remove "--test" argument, add "--list-all" and "--list-match" argument