Changed MessageControlType from TestMessage to LiveMessage