+ timeout stage
refactoring: alomost 100% coverage( still remains context features to test)