Moar test fixes.