Also adjust test cases to not fail if --help doesn't succeed, at least it doesn't for me if run as non-root.