Move out Timeout message for testability
refactor for unit tests
New tests