tests' refactoring