Simplifying outgoings methods
Fixing tests