moar test fixing