Refactoring to group tests in folders