various modernizations

modernized / clarified variable names in tests, culled erroneous files, tiny formatting improvements
Please delete MRR calls rather than commenting them out.