Refactor the test folder