Add sender test, refactor sender fot test