Rearrenged some code and added integration test between the client and the message stream class