US12: TA49: Adding Messages tests, changes to Messages to make tests pass.
US52: TA53: Updating service test