Moar test fixing--mostly due to change in the server.