SenderTester changes