Test folder refactoring