issues-9 timeout increased. Removed additional time needed. Refactoring.