Issue #1666 tests refactoring was done.