Add tests and messages.
Merge pull request #3 from dchilot/master

Add tests and messages.