moar test fixes