Fix unit test.
Fix the unit test some more.
Fix unit test and add methods.
Merge pull request #252 from greboid/awaymessages

Fix unit test.