Make tests happier
Moar test fixyfix