various modernizations

modernized / clarified variable names in tests, culled erroneous files, tiny formatting improvements
As above, no spaces around the return type.