Tests have gotten a bit crufty with lots of stuff commented out, etc. Do a walkthrough and clean that up