Issue #87. Moztrap 5932
speeded up tests
resolve merge conflict
Merge pull request #102 from sashakruglov/moztrap_5932

Issue #87. Moztrap #5932