Test fixes galore!
Everyone loves test fixes.