added TimeoutCalculater, added tests and setup in container
updated tests, integrated TimeoutCalculator