Changed test messages to comply with coding std