Began to integrate new Message class into tests. Refactored.