* Uncommenting test code which was working fine The commented lines have ran but other things broke, and they weren't patched in correctly.