Added some test classes and tested and fixed Message class