Refactor test files and folders