Updated tests to handle force_sender changes.