More unit tests. Fixes for the Contacts command.