TDD: need to complete tests and thinking about messages