fix When_handling_current_message_later tests

fixes #2440