Revert a test change, replace a few other things with our messages