Updated unit tests based on new default message format