Cleaned up LibraryMessage and LibraryMessageTest