Fix hack in test case.
Pass first test relating to variables.
Reformat and fix clashes of names.