Change test to use sender
Wip