[SUITEDEV-2114] pass options to the instance, related refactorings
[SUITEDEV-2114] pass options to the instance, related refactorings