Added separate commit with MessageManager.resendMessage unit tests