[SUITEDEV-2114] reorder methods