[TR, MY] {other} refactoring of tests