Add support for self user
Add test for transfers