refactoring and reorganizing tests in features sub-packages