[UPDATE] refactoring tests directories