various modernizations

modernized / clarified variable names in tests, culled erroneous files, tiny formatting improvements
Please split this across lines like the original code style did.