refactoring tests
Revert "refactoring tests"

This reverts commit 4f98b317132076e8e60f6b5435924304656d0693.
refactoring tests resources
refactoring tests