correctly test and fix self fulfillment
Merge pull request #70 from stefanpenner/master

correctly test and fix self fulfillment