various modernizations

modernized / clarified variable names in tests, culled erroneous files, tiny formatting improvements
Something strange is going on with the indentation here.