Updated Message class and spec tests
Updated Takeaway class and spec tests and removed duplicated methods