Starting over with reformat.
Works on class and classvar tests.