More test fixes, man.