Added some tests for Messages, reorganized test packages