Fixed _some_ doc test differences, but I give up

Wasted two hours on making this work, that's enough from me, especially given that I'm now testing
broken behaviour :(