Added tests for pendingincomingfriendlist command
Fixed a merge issue