various modernizations

modernized / clarified variable names in tests, culled erroneous files, tiny formatting improvements
i'm surprised...  this one was "weird"... even for me.