[NT] Tests refactoring