names refactoring
Preparing test enviroment