[SUITEDEV-2114] refactor test cases