Updates to the message tests and message route