hardcoded timeouts reverted
hardcoded timeouts reverted
test timeout increased
Merge pull request #358 from pisaychuk/analysis

Analysis, tests fixes