Patch Set 2: I would prefer that you didn't submit this; No score

The tests work when run individually, (also closing the Welcome page), but if I run the suite, I get out of memory (heap space). This is reproducible. Before changing the VM settings, could we try to check if we hold resources unneccessarily?
Also still some whitespace problems.