Added some unit tests
Fixed some issues with the message reloading