various modernizations

modernized / clarified variable names in tests, culled erroneous files, tiny formatting improvements
I agree, it’s subjective and I wish it were enforced by the tools/language.

Unfortunately Uncrustify isn’t totally up to the challenge, and neither are the other tools. So I think I’ll leave it as “please match my original code style.”