Tests refactoring
Tests refactoring