refactoring and reorganizing tests in features sub-packages
refactoring and reorganizing tests in features sub-packages