moar test updates and fixes